turn off php syntax check with tramp
Merge remote-tracking branch 'origin/master'