Merge branch 'mxc-rc' into mxc-master