Merge branch 'release/20140715_01' into develop
Merge branch 'release/20140715_02'