merge 2014-08-21