Fix typo in key generation script
Merge branch 'master' into public_demo_20130402