Merge remote-tracking branch 'origin/master' into 3dflip

# Conflicts:
#	js/libs/fluidbook/fluidbook.js

diff --cc js/libs/fluidbook/fluidbook.js
index 902149c3e687bea8a40506f485d9eb06dfb21e9a,a5d03154c2927bfff8678be19c06aee78d025889..f1f74d3c661e64b3a4fd6efd1432e2b759329260
--- 1/js/libs/fluidbook/fluidbook.js
--- 2/js/libs/fluidbook/fluidbook.js
+++ b/js/libs/fluidbook/fluidbook.js
@@@ -219,17 -201,12 +219,18 @@@ Fluidbook.prototype = 
          this.help = new FluidbookHelp(this);
          this.help.displayAtStartup();
  
 +        // Trigger a resize
          resize();
  
 +        // Trigger ready event
          $(this).trigger('fluidbookready');
          $(this).trigger('fluidbook.ready');
+         $(document).trigger('fluidbook.ready');
 +
 +        // Initial address handling
 +        this.changeAddress();
      },
 +
      loadPlugins: function () {
          $.each(this.datas.plugins, function (k, plugin) {
              try {