Revision 40615db0802c34ce1ed9611908cc9a13134cd075

Committed on 20/07/2018 1:44 am by Edi Modrić <edi.modric@gmail.com> [GitHub Diff]

Merge remote-tracking branch 'upstream/2.2'