Change-Id: I05213ca74cf3838c923ce6117ffdde28546d465f Reviewed-by: David Schulz <david.schulz@digia.com>