Plowshare git20131009

Closes #23318.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>