bar
Merge branch 'release/20140527_05521401195166' into develop