Itended fixes for #38
Merge branch 'dev' of https://github.com/raspberrypi/noobs into dev