Merge branch 'develop'
Authored by: David Aleixo 2018-05-30
Parent(s): [489239][a7ffc8]
Child(ren): [d5f2bb]