Merge pull request #1586 from robander/develop

Properties table cell misalligned if no value column #1373
Merge branch 'develop', remote-tracking branch 'upstream/develop' into develop