Merge commit 'origin/master' into tmbinc/FixTimingBugs