Merge branch 'release/20140527' into develop
bar
Merge branch 'release/20140527_05521401195166'