Second attempt to fix #777, still ensuring the rendering row count is sensible - just using a correct interpretation
Merge pull request #848 from dpangier/master

Second attempt to fix #777, still ensuring the rendering row count is sensible