Merge branch 'develop'
Authored by: Miguel Rodrigues 2018-06-07
Parent(s): [0765ef][667b40]
Child(ren): [719ff2]