Change-Id: I285a6102c0b7fefa7c4027d814654da640af39a9
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
Reviewed-by: Jake Petroules <jake.petroules@petroules.com>