Merge branch '20130516-dtrace-callout-sleep' into markj-develop
Merge branch '20130516-dtrace-callout-sleep' into markj-develop