small changes in testing
Merge commit 'bbbce78b05652773a325aef63214e2d837af1026' into 2014-11-06-Zurich