Fix luajit runtime error on 64-bit Mac OS X build. [ci skip]
Merge remote-tracking branch 'upstream/master'
add filter for filewatcher