merge 2014-11-29