Multiple updates from Feb, 18 2014.
Update DB.com
Clean up merge.
Merge branch 'master' into develop
Merge branch 'release/v1.1'