First round of option consolidation. many many more to come
Authored by: cellsafemode 2013-03-08
Parent: [r13561]
Child: [r13563]