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