Minor changes
Merge remote-tracking branch 'upstream/master' into vb573
Merge pull request #609 from balabhv/vb573

Housekeeping