Fix Bug 776101 - Add ARMv6 and x86 build download links to /firefox/channel/#aurora
Fix Bug 1005674 - The Flash video player allows cross-site includes due to a missing source check
Merge pull request #1572 from kyoshino/bug-776101-aurora-armv6

Fix Bug 776101 - Add ARMv6 and x86 build download links to /firefox/channel/#aurora
Fix Bug 1007758 - Update Terms and Conditions on /gigabit/terms
Merge pull request #1984 from mmmavis/bug-1007758-update-gigabit-terms

Fix Bug 1007758 - Update Terms and Conditions on /gigabit/terms
Fix bug 977391 - add GA tracking to contribute page
[fix bug 1008118] Issues with responsive layout of /contact on iOS
Bug 994831 - update history page

Replace previous history page with "15 facts" slideshow
Move previous history content to /history/details/
Merge pull request #1981 from mozilla/bug-994831-history-slideshow

Bug 994831 - update history page
Merge pull request #1985 from craigcook/bug-977391-add-tracking-to-contribute

Fix bug 977391 - add GA tracking to contribute page
Fix Bug 985968, ensure all valid versions of java are shown as up to date
Merge pull request #1987 from ossreleasefeed/bug985968-plugincheck-incorrectly-displays-java7-as-vulnerable

Bug985968 plugincheck incorrectly displays java7 as vulnerable
Update rna submodule

    21b3f9c43d6a10:                                                                                                                                                     [6/1947]

        Respect is_public in equiv release for bug 1008314

        Unless settings.DEV, filter is_public=True in
        equivalent_release_for_product method used by
        equivalent_android_release and equivalent_desktop_release

    9a5778a0c9bd7c:
        Add /release/:id/notes/ api + use in admin

        Add /auth_token/ url + view
        Replace NoteInline admin with ajax note table using api

        Fix bug 1004015: Updating the Note.releases m2m relation from the
                         release page in the admin should update the
                         Note.modified field
        Fix bug 979380:  Hide Note ID for bug
        Fix bug 974703:  Make it possible to add notes on the fly
                         from release view
        Fix bug 979390:  Add Edit link to edit notes from release detail
        Fix bug 979946:  RNA API: filter notes by release
Merge pull request #1990 from jgmize/update-rna

Update rna submodule
Fix Bug 1008521 - Broken link in about/history/details (foxkeh.com)
Merge pull request #1991 from kyoshino/bug-1008521-foxkeh-ssl

Fix Bug 1008521 - Broken link in about/history/details (foxkeh.com)
[fix bug 1006617] Firefox Facebook app shows the old logo and screenshots
Fix Bug 1008896 - Remove Open Badges from Product page on website
Fix Bug 1008321, plugincheck page now works in all versions of Firefox
Merge pull request #1986 from alexgibson/bug-1008118-responsive-rendering-contact-page-ios

[fix bug 1008118] Issues with responsive layout of /contact/spaces on iOS