Develop -> Master 1.8

Because GitHub for Windows sucks.