WIP
Version bumped
Merge branch 'release/201408211138'
Merge tag '201408211138' into develop

Version 201408211138