second commit
Merge branch 'release/20140724'