Merge branch 'develop'
Authored by: Miguel Rodrigues 2018-06-11
Parent(s): [633ad7][bbdabf]
Child(ren): [456085]