Merged master branch.

6 jobs for master in 11 minutes and 29 seconds (queued for 2 seconds)