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