Merge branch 'develop'
Authored by: Miguel Rodrigues 2018-06-01
Parent(s): [08bf0b][898fe2]
Child(ren): [4d4741]