#419 Added definition of tasks table. Test passes.
Merge remote-tracking branch 'upstream/master'
#419 Fix for qulice
#369 Fixed with unit test.
#369 Fix after review
#369 Fix after review