Updating to Kevins latest/greatest so we are all in sync
Merge branch 'srappocc_9aug2013_mergekevin'