Merge branch 'checkin'

3 jobs for master in 11 minutes and 28 seconds (queued for 1 second)