Squashed commit of the following:

commit d6775ed0234609c4f66f26b4250fe24729d6119f
Author: Islam Amer <islam.amer@jollamobile.com>
Date:   Sun Jan 19 23:51:54 2014 +0200

    [upstream] update to 0.23.1