Fixes for #1149 (Bullet lists)

WARNING: Bullet list ends without a blank line

See: https://readthedocs.org/builds/zf2/997644/
Merge pull request #1165 in master
Merge pull request #1157
Merge pull request #1157 in develop