merge from master
Merge branch 'indexes' of github.com:glg/nectar into indexes