Makes library minification safe
Merge branch 'minification_safe'