merges
Merge branch 'eric'