Squashed commit of the following:

commit 7e8e5eb03e5724720dc3700de5094eb9bd237c56
Author: Rob McVey <robmcvey@gmail.com>
Date:   Fri Oct 10 09:38:24 2014 +0100

    tested up to wordpress 4.0

git-svn-id: http://plugins.svn.wordpress.org/copify/trunk@1007319 b8457f37-d9ea-0310-8a92-e5e31aec5664
Merge branch 'svn'