Snapshot 11-15-14
Merge https://github.com/jpaldana/aftermirror-unstable