checkpoint
Merge branch 'addthis-4pull-new-tops' into addthis-mergeall
merged
revert broken class ref
Merge branch 'addthis-4pull-new-tops' into addthis-mergeall