WP-1331

I can't push into primary repo; could you merge this and add me to this repository please.