Merge pull request #1743 from rubenk/apcups-coverity