Revision 5944548d4981245142daf3dea7f729f3b341345a

Committed on 02/07/2018 2:59 am by Edi Modrić <edi.modric@gmail.com> [GitHub Diff]

Merge branch '1.4'