Merging changes from another repo.

Change-Id: Ib45d2e103bd616ebba77f19170943b518fbc8dc9
Merge branch 'master' of https://github.com/tomwalsh/wp-kbase