Squashed commit of the following:

commit b64edf9a093bb3083bd6f7c54dcb27977e7d5367
Author: Georgi Hristozov <georgi@forkbomb.nl>
Date:   Sat Jun 28 08:43:49 2014 +0300

    Dependency updates.