Commit 0244998ef858598b39d32d4794635a3eb740a8ff

Con Kolivas 2013-02-04T11:23:20

Merge branch 'master' into usb-dev