Merge branch 'develop'
Authored by: Miguel Rodrigues 2018-06-01
Parent(s): [b4547a][d16a51]
Child(ren): [d0fbd9]