Merge branch 'develop'
Authored by: Miguel Rodrigues 2018-07-19
Parent(s): [c6dc25][e92736]
Child(ren): [38169b]