merge branch 2014.4.31