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