Bump version.
Update to easily configure tests between master and dev.
Merge remote-tracking branch 'origin/master' into development
Merge back changes from master.