Bump version.
Merge remote-tracking branch 'origin/master' into development
Merge back changes from master.
Merge development changes.