copying poole/hyde
Merge branch 'dev'