Change-Id: I7de6ffc61ae04e25df93e355f820205732867af6 Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>