Merge branch 'develop'
Authored by: Miguel Rodrigues 2018-06-28
Parent(s): [3d0545][db2598]
Child(ren): [cea748]