quicksilver/Quicksilver — pull request #1714 by skurfer (2013-12-11 15:18:38+00:00)
Title: small fixes from a dead pull request

These are a couple of things that were included in #1455. That whole thing will need to be revisited later, but these fixes are mostly unrelated and can go now.