Merged Mike and Ben's changes from last week. ~JJB 20140906 9:55
Authored by: jayjaybillings 2014-09-06
Parent: [r182]
Child: [r184]