Merge from master:
commit 93ca90f3b8
Author: Vassilii Khachaturov <vassilii@tarunz.org>
Date: Thu Nov 14 22:41:46 2013 +0200
7197: more failing tests
commit 78cae43a32
Author: Vassilii Khachaturov <vassilii@tarunz.org>
Date: Wed Nov 13 16:59:26 2013 +0200
7197: better diagnostics from test for debugging
Use unittest -v/--verbose flag to trigger it.
commit 626353a0b3
Author: Vassilii Khachaturov <vassilii@tarunz.org>
Date: Wed Nov 13 13:52:47 2013 +0200
7197: failing test demonstrating the bug