Fixed typo.
Merge master into branch dreamhost
Version 21dcb3e6-da58-11e2-9f58-00238b21b463