Merge branch 'master' into tmbinc/FixTimingBugs