Merge branch 'dev' into fix-hidden-pattern-references

# Conflicts:
#	test/pattern_assembler_tests.js

Author: bmuenzenmeyer