Merge tag '201409041006' into develop

Version 201409041006 201409041006
WIP
Version bumped
Merge branch 'release/201409081127'