merge master@shipyard@2014.10.21