RE Z-INDEX FIXIN !
Merge branch 'master' into gh-pages