Remove planet hack

Planet hack removed. Obsolete.
Merge remote-tracking branch 'upstream/master'

Pulling the upstream back in the master