Merge branch 'release/release-1-27-2014_1_5_4' into development
Merge branch 'release/release-1-30-2014_1_5_6'