merging in latest fixes from unstable
merging in latest fixes from unstable

Merge branch 'unstable' of github.com:sociam/indx into unstable-well

indx/indx-core,indx/indx-core,indx/indx-core,indx/indx-core,indx/indx-core