Merge commit 'b151f48a06d9473a8ec079d928d4203d13e2568b' into kraken * commit 'b151f48a06d9473a8ec079d928d4203d13e2568b': Fix bug2537659
Merge commit 'b151f48a06d9473a8ec079d928d4203d13e2568b' into kraken * commit 'b151f48a06d9473a8ec079d928d4203d13e2568b': Fix bug2537659