graceful_startup in context processor
merge from Windows
Merge branch 'master' into Windows