Merge branch 'develop'
Authored by: Miguel Rodrigues 2018-06-28
Parent(s): [0f8f52][83d640]
Child(ren): [8511fc]