Added failing test for #86 (currently ignored)
Added another failing test for #86 (currently ignored)
Merge remote-tracking branch 'upstream/master'