Revision f505edb8261aed3d4402a290c3e8c5911f68fa12

Committed on 03/08/2018 12:57 am by Marek Nocon <[email protected]> [GitHub Diff]

Merge branch '1.7' into 1.13