index change again... :)
Merge branch 'localmaster' into hf0.12