Merge remote-tracking branch 'cancel-bug' into 0.13

This commit is contained in:
Mark Harrah 2013-07-19 18:56:01 -04:00
commit 0f9108d9d8

Diff Content Not Available