DEVELOPER-690 on state for navigation
Merge pull request #320 from pmuir/DEVELOPER-690

DEVELOPER-690 on state for navigation