Revision b309cc03662c9d83a0334c485327f2c47973b0f9

Committed on 19/01/2018 2:45 pm by André R <[email protected]> [GitHub Diff]

Merge branch '1.13' into 2.0