Merge branch 'develop'
Authored by: Miguel Rodrigues 2018-06-01
Parent(s): [d5f2bb][f72aa5]
Child(ren): [60d4c5]