Fixes to how updates are discovered and included, fixes #313
Merge branch 'docs-working'
Merge branch 'master' into docs-working