updated default configuration
Merge branch '1.0-scratchpad' into 1.0-develop
Merge remote-tracking branch 'origin/1.0-develop' into 1.0-develop