Commit changes from email dated 2012-09-11

Commit changes from Jon Scott's email dated 2012-09-11.

Signed-off-by: Jeff Godin <jgodin@tadl.org>