Specs for issue #780.
Merge pull request #852 from dblock/issue-780

Specs for issue #780.