Merge pull request #1165 from daverodgman/update-development-r