Merge branch 'develop'
Authored by: Miguel Rodrigues 2018-06-01
Parent(s): [8d19c0][d1f346]
Child(ren): [d16a51]