Backport changes from news_site branch, bringing offline capabilities out of the box

How awesome