Merge branch 'develop'
Authored by: Miguel Rodrigues 2018-05-29
Parent(s): [a08332][daa2d5]
Child(ren): [9002c3]