merge in latest changes from DrTon/jMAVSim: b39a8d3458143bbab4a061b2537e553d58a2319d