moved unit test tickets to bugs
Merge remote-tracking branch 'upstream/master'