Commit c04f3bf3bcb51b231ee0c1f6a2594b92ce31d632

Con Kolivas 2013-10-17T20:27:35

Merge branch 'master' into mergelibusb