Merge pull request #868 from code-dot-org/test

DTP
Merge branch 'test' into production
Merge branch 'test' into production
Merge pull request #884 from code-dot-org/test

DTP
hotfix skype redeem voucher image