Merge branch 'develop'
Authored by: David Aleixo 2018-05-30
Parent(s): [15a914][2c7e32]
Child(ren): [2ea3af]