FC-3986 Support. Thanks @1parkplace!
Merge pull request #121 from carrot/RFC-3986

FC-3986 Support