Revision 9ec40ba0dc38a55f15104d364e3b4ace70eef2d1

Committed on 13/08/2018 12:33 am by Edi Modrić <edi.modric@gmail.com> [GitHub Diff]

Merge remote-tracking branch 'upstream/2.2'