committing before pulling in changes from master