Merge tag '201409011548' into develop

Version 201409011548 201409011548
wip
Version bumped
Merge branch 'release/201409031531'