Comprehensive Note: Only Firefox supported due to Chrome AJAX cross-origin XMLHttpRequest bug
Merge branch 'develop' into staging
Merge branch 'staging'