adding failing test to see effects in travis
Merge remote-tracking branch 'origin/master'