Merge remote-tracking branch 'remotes/maxreitz/tags/pull-block-for-peter-2016-02...