Add credit for aliases
Merge branch 'master' into add/pl-translation

Add changes from 3adc486
Add changes from 3adc486