Cherry-pick commits to the release branch

commit c3d149b0aad1e09403fda2777e4f33c96a234da5
Author: Matthias Maier <tamiko@kyomu.43-1.org>
Date:   Thu Dec 18 00:11:43 2014 +0100

    Remove unfinised example steps 47 and 50