Mattdrayer/rebase 20140926 cherrypicks

@antoviaque -- this is the running PR for the cherry picks I'm working through -- I'll update the conversation thread after I'm done adding everything