TunnelBlanket/Kitsune — pull request #2 by widd (2014-08-21 18:58:11+00:00)
Title: Upstream

Merges all changes from the unstable branch