Merge branch 'hotfix/20130901.1'
Merge branch 'release/20130901.2'
Merge branch 'release/20130901.3'
Merge branch 'release/20130904.1'
Fix syntax errors and url issues with docs; pull in latest wiki entries
Bump version
Merge branch 'hotfix/20130904.1' into develop