Merge branch 'develop'
Authored by: Miguel Rodrigues 2018-06-11
Parent(s): [456085][9d2abd]
Child(ren): [bd5300]