fixes
Merge remote-tracking branch 'origin/master' into cleanup-flycheck