Missing field initializers.
Correct a comment.
Merge branch '20130624-sdt-module-info' into markj-develop