Comment 54 for bug 994685

@Daniel,

I also needed to backport commit 07b18f69a766375736a5313c29d808e59b1e13e9 to get commit 1c4a54b4513c175ba1a56d0aba8d9cf8f231d407 to compile properly. Commit 07b18f6 adds some function definitions that were missing.

I should have an update for you shortly.