Updated 'edge' to pull from '1.x-master' instead of 'master'