Don't ask me why I didn't make the names the same as the constants.
Merge branch 'develop' into hpricot