Merge cleanup
Missing change for last merge
New CPP11 tests are added for nullptr, stdarray