Merge branch 'develop'
Authored by: Miguel Rodrigues 2018-05-22
Parent(s): [aae0a0][bbf0b8]
Child(ren): [89dac4]