Merge branch 'develop'
Authored by: Miguel Rodrigues 2018-05-14
Parent(s): [037f14][bac118]
Child(ren): [270fc6][947560]