Merge dev branch in preparation for release