Merge branch 'develop'
Authored by: Miguel Rodrigues 2018-05-14
Parent(s): [0f70ec][cddd0c]
Child(ren): [5f0b3d]