Merge branch 'gilbert' into gilbert-1.3