Build: #171 failed Changes by George Moellenbrock and Takeshi Nakazato

Code commits

Casa6