Merge some fixes from the main book.
Updated to KDE Plasma 5.1.1