Merge branch 'develop'
Authored by: Miguel Rodrigues 2018-06-11
Parent(s): [03a763][719ff2]
Child(ren): [1ca3b4]