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