merging changes from jen's local, with perm changes
Merge remote-tracking branch 'origin/2776_new' into 2776_new
changing file perm