Merge branch 'master' into mdVideoThread

Conflicts:
libs/PhVideo/PhVideoEngine.cpp