merge master.

8 jobs for dev/removeTimeCredit in 175 minutes and 31 seconds (queued for 2 seconds)