Some updates
Version bumped
Merge branch 'release/201410170959'
Merge tag '201410170959' into develop

Version 201410170959 201410170959