Added by Ondrej Zajicek (work) about 5 years ago
Merge remote-tracking branch 'origin/master' into int-new