Pulled from master to keep the branches in sync
Changed version to develop-SNAPSHOT to emphasise the ongoing nature of this branch