Merge point after merge from LabrinthAVBBranch-Interop2013.