Merge branch 'master' into 20130324-ndp-locking
Add a comment explaining the reasoning behind our refcounting.
Merge branch '20130324-ndp-locking' into markj-develop