merge master into logmein in my account