Merge branch 'develop'
Authored by: Miguel Rodrigues 2018-05-29
Parent(s): [570abc][7d9897]
Child(ren): [15a914]