Bug 902834 - Implement hack and merge australis branch with master