Commit 24ee452e2f1d255704c93d33d623c4f29ca1a4ea

Authored by Paul Barrett
2 parents b0dc3a97 95882303

Merge branch 'master' into edge