Merging in changes to Git Convenience since last PR