Merge in more dev changes.
--HG-- extra : convert_revision : e985df0a78315379bcfe7845d09869547122ebc7