Merge branch 'release/20140720_2' into develop
hotfix 20140721_3
Revert "hotfix 20140721_3"

This reverts commit ed3a3c1b7d27f6425748b183e66cb6452261cba1.
hotfix 20140721_3
Merge branch 'hotfix/20140720_3'