improve contents mode check, so have patching enabled for Py,CL and others
support CLion fetch
Merge remote-tracking branch 'origin/master'