Merge commits with @dcgauld, recommitting to dev branch