enabled disabled test
Merged in pull request #1165