Added two degree levels into levels definition, added a new test case
Merged changes of core into wp