Merge tag '201409031531' into develop

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