Merge branch 'master' into release/release-1-27-2014_1_5_4
final add
Merge branch 'release/release-1-27-2014_1_5_4'