Silly psav, and != or
Merge pull request #1238 from psav/upgrade_dkbprt

Silly psav, and != or