Merge branch 'develop'
Authored by: Miguel Rodrigues 2018-09-14
Parent(s): [0ce2c5][38169b]
Child(ren): [a26b4e]