merge 2014-10-21