Merge branch 'develop'
Authored by: Miguel Rodrigues 2018-06-27
Parent(s): [839883][f1d3f7]
Child(ren): [83d640]