merging wp dev branch into ssandy