King now sent separately
Merge branch 'drag-and-drop' of https://github.com/trello/staunton into hao
Merge remote-tracking branch 'github/hao' into drag-and-drop