got rid of some planitems
Merge remote-tracking branch 'origin/master'