Merge branch 'develop'
Authored by: Miguel Rodrigues 2018-05-11
Parent(s): [118813][92f47a]
Child(ren): [09ee40]
