Merge branch 'develop'
Authored by: Miguel Rodrigues 2018-07-05
Parent(s): [84a4a3][c75285]
Child(ren): [df0aed]