Sync master into develop#314

emmadesilva wants to merge 11 commits intodevelophydephp/hyde:developfrom

sync-develophydephp/hyde:sync-developCopy head branch name to clipboard