Merge branch 'release/release-1-22-2014_1_5_3' into develop
Merge branch 'release/release-1-27-2014_1_5_4'