Commit ab0cc58cb42dc7f1ab547079fa43811dda467281

Con Kolivas 2013-02-15T23:15:11

Merge branch 'master' into usb-dev