Please merge, so all modules build properly!

Thanks! :)