indicator rename
Merge remote-tracking branch 'upstream/master'
companion changes
Merge pull request #293 from jpecht/master

companion changes / indicator rename