Merge remote-tracking branch 'origin/master' into macosx-travisCI-experimental

Conflicts:
	lightcrafts/jnisrc/fileutil/FileUtil.cpp
MacOSX - Fixed crash when opening via right-click menu; reverted and modified 6daec9