Merged all the changes since July 2013

No need to merge this just yet, we'll need it once assistant_prototype is merged.