Fixes issue with setup not creating indexes correctly
Merge branch 'two-dot-o' into cloudformation-update