Merge tag '201408201515' into develop

Version 201408201515
WIP
Version bumped
Merge branch 'release/201408211138'