Merge branch 'develop'
Authored by: Miguel Rodrigues 2018-06-27
Parent(s): [bd8f3d][dbe426]
Child(ren): [18557b]