load 1404 changeset

git-svn-id: https://plugins.svn.wordpress.org/table-of-contents-plus/trunk@897002 b8457f37-d9ea-0310-8a92-e5e31aec5664
Merge remote-tracking branch 'upstream/master' into lechnology