Merge tag 'v20140504' into develop

v20140504
fix typo
Merge branch 'develop'