Merge branch '3.1.x' into 3.2.x
* 3.1.x:
[ticket/14802] Add test for empty/blank lines in poll options
[ticket/14802] Empty/blank lines should not be additional poll options
Merge pull request #4471 from dsinn/ticket/14802
[ticket/14802] Empty/blank lines should not be additional poll options
* dsinn/ticket/14802:
[ticket/14802] Add test for empty/blank lines in poll options
[ticket/14802] Empty/blank lines should not be additional poll options