Squashed commit of the following:

commit 189fe125b953ad778ee0e38d046de76845993e2d
Author: Ramón Cahenzli <rca@psy-q.ch>
Date:   Tue Nov 4 14:16:26 2014 +0100

    Use other filename again.