Now links and runs with libxpcomrt
Merge branch 'origin-master'