adding unprofiled but instrumented h264
Merge remote-tracking branch 'remotes/origin/master' into dev