fix breadcrumb indicator
Merge remote-tracking branch 'upstream/4.0' into 4.0
fix breadcrumb indicator
Merge pull request #514 from unl/issue-509

Closes Issue 509