Merge branch 'develop'
Authored by: Miguel Rodrigues 2018-06-27
Parent(s): [18557b][6cd069]
Child(ren): [7b2f8b]