Hotfix for security updates SA-CONTRIB-2014-001 and PSA-2014-001, fixes #AW-1400