fixed old bundle (Don's) bug
Merge remote-tracking branch 'origin/master'