Change-Id: I8ee2960cf309f1e1d9db41c848be21c0442ebb29 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>