AW-1739 #comment SA-CONTRIB-2014-042
AW-1739 #resolve SA-CONTRIB-2014-043
Merge remote branch 'origin/security-aw1739' into develop