Merge pull request #440 from peternewman/e1.37-2

Remove some code duplication now we're building the libraries as one big bundle