Merge branch 'develop'
Authored by: Miguel Rodrigues 2018-05-28
Parent(s): [0fa0fe][193635]
Child(ren): [a08332]