Weekly and full caps for prowess
Merge remote-tracking branch 'origin/master'