Merge branch 'develop'
Authored by: Miguel Rodrigues 2018-06-08
Parent(s): [361c77][5d307b]
Child(ren): [633ad7]