Revert "Revert "Minor miscellaneous changes for NOOBS v1.3.8""

This reverts commit 8bc53c36d0870825cc20ddb5ad1621efd8b6b35e.
Merge branch 'master' of https://github.com/sople1/noobs