Merge branch 'develop'
Authored by: Miguel Rodrigues 2018-05-29
Parent(s): [98d6e2][9b8d78]
Child(ren): [fed11b]