Merge 3.7pre20131013 back into master

IMHO NTT 3.7pre20131013 (the current beta at AMO) has "baked" enough (almost 4 months) to be merged into master.

@xabolcs : Github tells me that some manual merging will be necessary. Merge conflict involves at least the version number in the install.rdf, I suppose.
@whimboo : I'd also like approval=you. The list of changes looks more extensive than I had thought.