Merge branch 'develop'
Authored by: Miguel Rodrigues 2018-05-30
Parent(s): [af29e1][c3d06d]
Child(ren): [489239]