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