(c) 2014
Update submodules
Fix build with latest submodules