Merge remote-tracking branch 'refs/remotes/origin/master' into epc-2014203
minor: typo correction
Merge branch 'epc-2014203' of github.com:epc/docs into epc-2014203