Version bump. Minor adjustments to recent merge requests.