Extracted fixes from GitHub's Facebox.
Extracted fixes from GitHub's Facebox.

hagb4rd/facebox,christophercaburog/facebox,defunkt/facebox,CantemoInternal/facebox,rstocker99/facebox,hagb4rd/facebox,snikch/facebox