Squashed commit of the following:

commit 1f67f308d5ddc9420b47dfa383e4c9bf08d6631c
Author: Andreas Strid <andreas_strid@bredband.net>
Date:   Thu Apr 11 22:11:19 2013 +0200

    Forget to save in vs...