Merged latest from the original master (bringing plugin to latest available official release).

NB: Note: none of our customizations are brought in yet; this is the next step.