Merge branch 'develop'
Authored by: Miguel Rodrigues 2018-05-24
Parent(s): [385b9e][89bcea]
Child(ren): [fe3f30]