Merging Mike's updates. Ran a spellchecker but I don't exactly trust it. ~JJB 20140912 12:10
Authored by: jayjaybillings 2014-09-12
Parent: [r188]
Child: [r190]
