[reSIProcate] [resiprocate] Merge latest work from Mozilla. (#13)

[docfaraday]

I see no harm in merging this now.

---
Reply to this email directly or view it on GitHub:
https://github.com/resiprocate/resiprocate/pull/13#issuecomment-103587745
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://list.resiprocate.org/pipermail/resiprocate-devel/attachments/20150519/ddd31413/attachment.htm>