Plowshare git20131102

Closes #23921.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>