Generated master for commit 3919806
Author: Anthony Scopatz <scopatz@gmail.com>

    messed up location of edits