Merge branches 'code_outside_webroot' and 'share_on_statusnet' into production