Merge branch 'develop'
Authored by: Miguel Rodrigues 2018-09-11
Parent(s): [806059][efc50f]
Child(ren): [8885e3]