Fix tool shed e-mail functionality broken with 0d46133c90452dc8815de7057b13548f06beb7bb.
Merge next-stable.