Commit 728a013b7f3b80fbc592f90eb537ff2f2956dfbd

Linquize 2015-01-28T23:04:50

Fix test failures when 8.3 is disabled