Merge Custom-Poll

Merging in all relevant changes from the Custom-Poll branch into this
one.