Changes to ensure Macademia works!
Merge remote-tracking branch 'origin/dev' into dev