Squashed commit of the following:

commit bc196ed204a3a8226369478cc76b98d2799dc44f
Author: Matthew Pierpont <mpierpont@bannerengineering.com>
Date:   Fri Oct 31 14:23:25 2014 -0500

    update to ECO 121297

commit 73eb1256854ee599b73e83b195f5c384021c6c49
Merge: 62bda19 f6555f5
Author: Matthew Pierpont <mpierpont@bannerengineering.com>
Date:   Fri Oct 31 14:22:45 2014 -0500

    Merge branch 'master' into ECO/121297_Q3X_Firmware

commit 62bda19375de0ddab1d878727f0dd9343524ec52
Author: Matthew Pierpont <mpierpont@bannerengineering.com>
Date:   Wed Oct 29 07:26:59 2014 -0500

    ECO 121297 Release