Fix issue http://forum.fenoxo.com/thread-8641.html
Also update submodules.