Merged Deltadebugger from array branch
Merge branch 'master' into array