Revision c2e9c0149d602a75dee96b7e1bffed11ee2221c2

Committed on 30/07/2018 6:26 am by Edi Modrić <[email protected]> [GitHub Diff]

Merge remote-tracking branch 'upstream/2.2'