Commit 2840a104c1288af79cbda720afa9e37aec6fb29d

Michiharu Ariza 2018-11-01T16:18:13

tweaks to build with new merge