Merge changes from release to dev branch

Sorry about the mess, just resyncing changes to devel from release 0.2