Merge branch 'develop'
Authored by: Miguel Rodrigues 2018-05-28
Parent(s): [0420d5][69bb38]
Child(ren): [9b8d78]