Merge branch 'master' into 2014_4_27
test
Merge branch '2014_4_27'