Merge branch '20141012-dtrace-kyua2' into markj-develop
Merge branch 'markj-develop' of github.com:markjdb/freebsd into markj-develop
Merge branch 'markj-develop' of github.com:markjdb/freebsd into markj-develop