Revision f0dd2701847919db17a1db732378d327d7d5f6c9

Committed on 05/01/2018 7:47 am by André R <[email protected]> [GitHub Diff]

Merge branch '1.13' into 2.0