merge 2014-12-30