Wicked7

bnc#877322, along with a few other edits/updates.