Build: #18 failed Changes by Mark Kettenis <kettenis@jive.eu> and Kumar Golap

Code commits

Casa6