4ec730cabb
Merge commit '7361b7410f2427022cc8917b00553dc26107cded' into kraken * commit '7361b7410f2427022cc8917b00553dc26107cded': Uncomment a test that was marked as STOPSHIP