Squashed commit of the following:

commit c16a47817e37f64b7100e8604759fe1e017b6937
Author: Rob McVey <robmcvey@gmail.com>
Date:   Thu Oct 9 12:15:32 2014 +0100

git-svn-id: https://plugins.svn.wordpress.org/copify/trunk@1004398 b8457f37-d9ea-0310-8a92-e5e31aec5664