merge 2014-09-20