Merge branch 'master' into travis-windows

No match.