Merge branch 'develop'
Authored by: Miguel Rodrigues 2018-05-29
Parent(s): [484891][fed11b]
Child(ren): [7d9897]