Merge release/3.0 to dev branch

Done in a separate branch because of conflicts.
This, then, becomes ``allow(current_user).to receive(:allowed_to?)...``.