Merge branch 'develop'
Authored by: Miguel Rodrigues 2018-07-19
Parent(s): [5671b7][cb0e67]
Child(ren): [806059]