use the correct method for hiding and displaying loading-indicator
Merge branch 'master' into gh-pages