Merged in changes from master
7 files changed