Merged updated files from master
Merge branch 'v1.3'