diff -Nru firefox-47.0+build2/browser/app/blocklist.xml firefox-47.0+build3/browser/app/blocklist.xml
--- firefox-47.0+build2/browser/app/blocklist.xml	2016-06-03 14:49:32.000000000 +0000
+++ firefox-47.0+build3/browser/app/blocklist.xml	2016-06-06 09:56:28.000000000 +0000
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1464091834000">
+<blocklist xmlns="http://www.mozilla.org/2006/addons-blocklist" lastupdate="1464967719000">
   <emItems>
       <emItem  blockID="i58" id="webmaster@buzzzzvideos.info">
                         <versionRange  minVersion="0" maxVersion="*">
@@ -364,6 +364,15 @@
                     <prefs>
               </prefs>
     </emItem>
+      <emItem  blockID="i1227" id="{A34CAF42-A3E3-11E5-945F-18C31D5D46B0}">
+                        <versionRange  minVersion="0" maxVersion="*" severity="1">
+                    </versionRange>
+                    <prefs>
+                  <pref>security.csp.enable</pref>
+                  <pref>security.fileuri.strict_origin_policy</pref>
+                  <pref>security.mixed_content.block_active_content</pref>
+              </prefs>
+    </emItem>
       <emItem  blockID="i1129" id="youtubeunblocker__web@unblocker.yt">
                         <versionRange  minVersion="0" maxVersion="*" severity="3">
                     </versionRange>
@@ -485,6 +494,12 @@
                     <prefs>
               </prefs>
     </emItem>
+      <emItem  blockID="i1229" id="/^.*@unblocker\.yt$/">
+                        <versionRange  minVersion="0" maxVersion="*" severity="3">
+                    </versionRange>
+                    <prefs>
+              </prefs>
+    </emItem>
       <emItem  blockID="i404" id="{a9bb9fa0-4122-4c75-bd9a-bc27db3f9155}">
                         <versionRange  minVersion="0" maxVersion="*" severity="1">
                     </versionRange>
@@ -978,7 +993,9 @@
               </prefs>
     </emItem>
       <emItem  blockID="i1222" id="tmbepff@trendmicro.com">
-                        <versionRange  minVersion="0" maxVersion="9.2.0.1024" severity="1">
+                        <versionRange  minVersion="0" maxVersion="9.1.0.1035" severity="1">
+                    </versionRange>
+                                <versionRange  minVersion="9.2" maxVersion="9.2.0.1023" severity="1">
                     </versionRange>
                     <prefs>
               </prefs>
@@ -1653,6 +1670,12 @@
                     <prefs>
               </prefs>
     </emItem>
+      <emItem  blockID="i1228" id="unblocker30__web@unblocker.yt">
+                        <versionRange  minVersion="0" maxVersion="*" severity="3">
+                    </versionRange>
+                    <prefs>
+              </prefs>
+    </emItem>
       <emItem  blockID="i692" id="/^(j003-lqgrmgpcekslhg|SupraSavings|j003-dkqonnnthqjnkq|j003-kaggrpmirxjpzh)@jetpack$/">
                         <versionRange  minVersion="0" maxVersion="*" severity="1">
                     </versionRange>
@@ -3478,6 +3501,18 @@
                   <match name="filename" exp="npqtplugin\.dll" />                      <versionRange  minVersion="0" maxVersion="*" severity="0" vulnerabilitystatus="2"></versionRange>
                             <infoURL>https://support.apple.com/en-us/HT205771</infoURL>
           </pluginItem>
+      <pluginItem  os="Linux" blockID="p1224">
+                  <match name="filename" exp="libflashplayer\.so" />                      <versionRange  minVersion="11.2.202.577" maxVersion="11.2.202.616" severity="0" vulnerabilitystatus="1"></versionRange>
+                            <infoURL>https://get.adobe.com/flashplayer/</infoURL>
+          </pluginItem>
+      <pluginItem  blockID="p1225">
+                  <match name="filename" exp="(NPSWF32.*\.dll)|(NPSWF64.*\.dll)|(Flash\ Player\.plugin)" />                      <versionRange  minVersion="18.0.0.333" maxVersion="18.0.0.343" severity="0" vulnerabilitystatus="1"></versionRange>
+                            <infoURL>https://get.adobe.com/flashplayer/</infoURL>
+          </pluginItem>
+      <pluginItem  blockID="p1226">
+                  <match name="filename" exp="(NPSWF32.*\.dll)|(NPSWF64.*\.dll)|(Flash\ Player\.plugin)" />                      <versionRange  minVersion="21.0.0.197" maxVersion="21.0.0.226" severity="0" vulnerabilitystatus="1"></versionRange>
+                            <infoURL>https://get.adobe.com/flashplayer/</infoURL>
+          </pluginItem>
     </pluginItems>
 
   <gfxItems>
diff -Nru firefox-47.0+build2/debian/changelog firefox-47.0+build3/debian/changelog
--- firefox-47.0+build2/debian/changelog	2016-06-03 15:51:53.000000000 +0000
+++ firefox-47.0+build3/debian/changelog	2016-06-06 10:20:10.000000000 +0000
@@ -1,3 +1,10 @@
+firefox (47.0+build3-0ubuntu1) yakkety; urgency=medium
+
+  * New upstream stable release (47.0build3)
+    - see USN-2993-1
+
+ -- Chris Coulson <chris.coulson@canonical.com>  Mon, 06 Jun 2016 11:18:37 +0100
+
 firefox (47.0+build2-0ubuntu1) yakkety; urgency=medium
 
   * New upstream stable release (47.0build2)
diff -Nru firefox-47.0+build2/l10n/changesets firefox-47.0+build3/l10n/changesets
--- firefox-47.0+build2/l10n/changesets	2016-06-03 15:02:52.000000000 +0000
+++ firefox-47.0+build3/l10n/changesets	2016-06-06 10:10:10.000000000 +0000
@@ -1,91 +1,91 @@
 ach 696:ddc89151667a
 af 943:d1b4dd37a38b
-an 758:b358c3996cc6
-ar 2112:0cbfa74d7abf
-as 1018:643e991001cf
+an 759:90f4108be5df
+ar 2113:a58edec3b74f
+as 1019:227a03103b58
 ast 1597:2da203d746e0
-az 733:9b147441b0f0
-be 2102:0ee73a579dd9
+az 734:7234b1479cf9
+be 2103:a0869fad26d5
 bg 1419:bd6f985c90ae
 bn-BD 1342:75e6e11ccc5f
-bn-IN 1254:55999f2f1273
-br 1712:c65cdfb9a5db
+bn-IN 1255:86269f13a4f4
+br 1713:58fa999e6213
 bs 841:ddeed9762ed9
-ca 2858:e69637b5ac5b
-cak 354:70fe2059f302
-cs 4585:6caccb319faf
-cy 1489:1a7b6a125bbc
-da 2607:33b3f28c8b0e
-de 5341:2117578d9837
-dsb 727:78cf9aaaf949
+ca 2859:d6633f2b97c9
+cak 355:e766801531b3
+cs 4586:29239a90267a
+cy 1490:a57968ce60be
+da 2608:72e2482012ec
+de 5342:765a9f4ab299
+dsb 728:e500a3d970e9
 el 1567:95e1e72d6205
-en-GB 2348:fd32bdf6c836
+en-GB 2349:aefcdafd360f
 en-ZA 801:7a61d01b7737
-eo 1318:ea1aac736159
-es-AR 2954:657c07c55e6a
+eo 1319:356f2460bb16
+es-AR 2955:613b5e27bf0d
 es-CL 1336:f6935bc737b6
-es-ES 4624:74b2d76e2296
-es-MX 1481:f4bc29251c0d
-et 2136:f13518623118
-eu 1987:90e69fedb7f5
-fa 1521:72f3a33eb371
-ff 846:9781e24060ff
-fi 2599:eda6d83280ca
-fr 7602:4852a4c8d954
-fy-NL 2984:1e0ce33b3dc9
-ga-IE 2189:491989a19981
-gd 2055:9d2a01d7bfa4
-gl 3402:0df1cb9c9563
+es-ES 4625:86783d650359
+es-MX 1482:73d38809ab3b
+et 2137:b15536f9eed6
+eu 1988:0ac3a0533cc2
+fa 1522:2f0a9a132288
+ff 847:5a5eaf493b9a
+fi 2600:59ff80770918
+fr 7603:ae19ad1519a1
+fy-NL 2985:453ca86746e1
+ga-IE 2190:6072c133e082
+gd 2056:f6e71779ac97
+gl 3403:ace13b68685c
 gn 87:bd0fbd395dd4
-gu-IN 1497:cfc9e715500d
+gu-IN 1498:d722dbd92590
 he 1731:b30679c8a7a2
-hi-IN 1375:9d2c784d54f2
-hr 2117:d7aa4dc7d98a
-hsb 880:4f5b0e05f8a6
-hu 2914:b87a0541a9f0
-hy-AM 1630:04d2e4bfcb1a
-id 2048:0944a1c902cd
-is 1758:2e21f0dad808
-it 6783:eca61f1f3585
-ja 2797:a42851e721c9
+hi-IN 1376:5c09ed5c544d
+hr 2118:39406b7f1632
+hsb 881:93461085caa0
+hu 2915:327191cf3b84
+hy-AM 1631:d95a08f378a6
+id 2049:396492466199
+is 1759:9ed8a2039d42
+it 6784:2e0e6b7eb348
+ja 2798:c0190c1e8d91
 ja-JP-mac 2305:2a6c9bba65d3
-kk 1376:8cfba84b2a8b
+kk 1377:8aa57f2d729a
 km 888:702bb2200946
-kn 1320:251275711560
-ko 2362:9632a962aea0
+kn 1321:e5d13c79e654
+ko 2363:9c426622a6ee
 lij 986:22d50f206118
-lt 3435:aa1a5064bb46
-lv 1610:3920789d8619
-mai 1107:e37719352f84
+lt 3436:8d74a151627f
+lv 1611:5411125a3e9c
+mai 1108:e9c3109b3b94
 mk 824:513f77d00df2
-ml 1255:ac68a817cb27
-mr 1371:cfa7aa428d11
-ms 735:06691517c1f0
-nb-NO 3083:8e68371f6f18
-nl 5975:e2beaee858b1
+ml 1256:7d0e82731aa2
+mr 1372:2ba2c798bc72
+ms 736:e7a5f3b84e10
+nb-NO 3084:ed7d4b2913dc
+nl 5976:b64f8d9d74ee
 nn-NO 1769:4cf5e0b70f32
-or 1098:7a7940b85155
-pa-IN 2166:2427e0933676
-pl 8767:27868004e847
-pt-BR 2682:29991e81df3a
-pt-PT 5443:377967ffbb33
-rm 1679:1368f113f4fc
-ro 2328:d5efa73fb210
-ru 4540:833929ce6050
+or 1099:07ac7ef999a5
+pa-IN 2167:01ed33f96a84
+pl 8768:22cbe98e11dd
+pt-BR 2683:e75370ed6ab9
+pt-PT 5444:594ec84a3201
+rm 1680:b537eca47de9
+ro 2329:783383b6f311
+ru 4541:2b9b9b1fdc3c
 si 1505:9b0b52e09579
-sk 4310:4233b824b853
-sl 2799:ed558346aa4a
-son 1107:a8128bb759e0
-sq 2306:1bbc91c692af
-sr 1490:ae2333266f9b
-sv-SE 5147:e086ba614811
-ta 1136:c8582c52c09c
-te 1183:788276d5aca4
-th 1550:3615e733837f
-tr 2655:c0163f8431d4
-uk 3484:2affea883515
-uz 652:bd59d88e0ea2
+sk 4311:23f620ef26da
+sl 2800:4f6b2dda89af
+son 1108:87c758c9a0ab
+sq 2307:ec2eea886a85
+sr 1491:9154ee0edf8e
+sv-SE 5148:18c653a4f19a
+ta 1137:1f99b296e42f
+te 1184:214d85136ae6
+th 1551:779f7b00eb43
+tr 2656:9a92b90d82b8
+uk 3485:efee935e104f
+uz 653:d74793cb053c
 vi 1194:57093fadc5c3
-xh 897:4cf42ebb405c
-zh-CN 2795:a1ff8e6e3ba2
-zh-TW 3031:16008ed20099
+xh 898:5297da616452
+zh-CN 2796:4964aaaf77f8
+zh-TW 3032:5b549d403f20
diff -Nru firefox-47.0+build2/media/libstagefright/binding/MoofParser.cpp firefox-47.0+build3/media/libstagefright/binding/MoofParser.cpp
--- firefox-47.0+build2/media/libstagefright/binding/MoofParser.cpp	2016-06-03 14:49:35.000000000 +0000
+++ firefox-47.0+build3/media/libstagefright/binding/MoofParser.cpp	2016-06-06 09:56:31.000000000 +0000
@@ -394,13 +394,13 @@
         aMdhd.ToMicroseconds((int64_t)*aDecodeTime - aEdts.mMediaStart)
         + aMvhd.ToMicroseconds(aEdts.mEmptyOffset);
       int64_t decodeDuration = endDecodeTime - mIndex[0].mDecodeTime;
-      float adjust = (float)decodeDuration / presentationDuration;
+      double adjust = (double)decodeDuration / presentationDuration;
       int64_t dtsOffset = mIndex[0].mDecodeTime;
       int64_t compositionDuration = 0;
       // Adjust the dts, ensuring that the new adjusted dts will never be greater
       // than decodeTime (the next moof's decode start time).
       for (auto& sample : mIndex) {
-        sample.mDecodeTime = dtsOffset + compositionDuration * adjust;
+        sample.mDecodeTime = dtsOffset + int64_t(compositionDuration * adjust);
         compositionDuration += sample.mCompositionRange.Length();
       }
       mTimeRange = Interval<Microseconds>(ctsOrder[0]->mCompositionRange.start,
diff -Nru firefox-47.0+build2/SOURCE_CHANGESET firefox-47.0+build3/SOURCE_CHANGESET
--- firefox-47.0+build2/SOURCE_CHANGESET	2016-06-03 14:49:39.000000000 +0000
+++ firefox-47.0+build3/SOURCE_CHANGESET	2016-06-06 09:56:36.000000000 +0000
@@ -1 +1 @@
-8815c6471061f5d3f218e53cb74dfba79666edfb
\ No newline at end of file
+b0310cb90fd0158abd0e92850a47768649ba3d77
\ No newline at end of file