Merge branch 'develop'
Authored by: Miguel Rodrigues 2018-06-27
Parent(s): [7b2f8b][87cb65]
Child(ren): [d72f44]