Fix build
Fix it properly
Merge remote-tracking branch 'upstream/master'