Merge pull request #147 from unwin/develop

Fix for FB 4927, and some ride alongs....
Fix build error. Closer, but not yet there, but there is a cup of water
next to the laptop...