Adds uservoice support
Merge branch 'uservoice'