Put in the correct name (thanks @jbonnett)
Merge remote-tracking branch 'armstrong/master'