3e86836c

By: Michael Lynch <git@mtlynch.io>

Merge remote-tracking branch 'origin/master' into mobile-swipe

# Conflicts:
#	handlers/templates/pages/media.html