Bring in latest changes from NeverStop, except for the blog updates