Merge branch 'master' into 20131220-fasttrap-scratch-space
Merge branch '20131220-fasttrap-scratch-space' into markj-develop
Merge branch 'markj-develop' of github.com:markjdb/freebsd into markj-develop