Commit 9dcc4a36f709f013ed111924754021fddfc933e6

Linquize 2015-01-28T23:04:50

Fix test failures when 8.3 is disabled