Merge branch 'develop'
Authored by: Miguel Rodrigues 2018-06-11
Parent(s): [1ca3b4][869cc9]
Child(ren): [bd8f3d]