Modified since current_user_can() returns boolean ;)
Merge remote-tracking branch 'origin/master' into welcome