Update locator due to changes in Bug 987880
Merge pull request #496 from viorelaioia/update-locator

Update locator due to changes in Bug 987880