Fix for horrible pull request merge I've done...
Fix for horrible pull request merge I've done...
bridadan/mbed-ls,jjones646/mbed-ls,jjones646/mbed-ls,0xc0170/mbed-ls,mazimkhan/mbed-ls,jupe/mbed-ls,jupe/mbed-ls,mtmtech/mbed-ls,bridadan/mbed-ls,mtmtech/mbed-ls,mazimkhan/mbed-ls