Merge branch 'master' into 20131220-fasttrap-scratch-space
Comments, style fixes...
Merge branch '20131220-fasttrap-scratch-space' into markj-develop
Fix a dumb mistake.
Merge branch '20131220-fasttrap-scratch-space' into markj-develop