Merge branch 'release'
Updated makefile to point to ding2 master branches
Merge remote-tracking branch 'origin' into release