Merge branch 'develop'
Authored by: Miguel Rodrigues 2018-05-27
Parent(s): [5cacdf][798bd2]
Child(ren): [193635]