updated to release version
Merge branch 'master' into 1.0
Merge branch 'master' into 1.0
Merge branch 'master' into 1.0
Merge branch 'master' into 1.0
Merge branch 'master' into 1.0
Merge branch 'master' into 1.0
Merge branch 'master' into 1.0
Merge branch 'master' into 1.0
Merge branch 'master' into 1.0
Merge branch 'master' into 1.0
Merge branch 'master' into 1.0
Merge branch 'master' into 1.0
Merge branch 'master' into 1.0
Merge branch 'master' into 1.0
Merge branch 'master' into 1.0
Merge branch 'master' into 1.0
Merged from master
Merge branch 'master' into 1.0
Merge branch 'master' into 1.0