Pick up pile of changes made for beta
    
    A bunch of changes to master and f19 were made shortly before
    beta to get things under their size limits. Some other fixes
    were made as well.