Merge branch 'master' of git://github.com/mozilla/pdf.js.git into l10n

Conflicts:
	web/viewer.js

diff --cc web/viewer.js
index ba3bc6a3548ff947a5b4f3900d73d016eba0f0ea,26c5de805fec2b951c4570461aba3b2a6862b524..849ef83011453a0f293fa16f2ccdf440d333b60a
--- 1/web/viewer.js
--- 2/web/viewer.js
+++ b/web/viewer.js
@@@ -836,8 -826,8 +836,8 @@@ var PageView = function pageView(contai
        var type = item.type;
        var rect = viewport.convertToViewportRectangle(item.rect);
        rect = PDFJS.Util.normalizeRect(rect);
-       image.src = kImageDirectory + type.toLowerCase() + '.svg';
+       image.src = kImageDirectory + 'annotation-' + type.toLowerCase() + '.svg';
 -      image.alt = '[' + type + ' Annotation]';
 +      image.alt = mozL10n.get('text_annotation_type', {type: type});
        var content = document.createElement('div');
        content.setAttribute('hidden', true);
        var title = document.createElement('h1');