Merge branch 'release-20130306'
Merge branch 'release-20130610'
Updated outline and fixed typos
Merge branch 'master' into develop