Merge branch 'develop'
Authored by: Miguel Rodrigues 2018-05-24
Parent(s): [5ee62d][b33563]
Child(ren): [e2dfeb]