Fixes #1399: Add back `enforceTimeLimit` (accidently removed in a8aa89e).
Merge branch '4.2' into 4.3
Merge branch '4.3'