hacked a bit to keep everything working
Merge remote-tracking branch 'origin/master'