Merge in mikecahu's Patch/2014-11-11

Merge in the changes from @mikechau.