Bump version #
Update Changes file, bump version #
Merge remote-tracking branch 'origin/trial'