temp compile fix for passing travis test
Merge remote-tracking branch 'origin/master'