Merge 2014-10-27