Catching up to 2013 changes

Need to rebase against the old changes.