Update 'git pull' and 'git checkout' aliases.
Merge branch 'develop'