Docs: add an 'import' in one spot to make the recipe easier to swallow
Merge pull request #1081 from jaredgrubb/doc-props-add-import

Docs: add an 'import' in one spot to make the recipe easier to swallow
fix pngstatus if the build is currently in progress
Merge kviktor/buildbot:png-status-building (PR #1082)
Fix docs/conf.py to work with sphinx-1.2.2

Closes gh-1086.
Merge branch 'master' into nine

Conflicts:
	master/buildbot/status/web/pngstatus.py