Remove an assertion that prevents mergefunc from doing its magic.
Fix a possible memory corruption bug when using val::as
Bring back Joe's original test too
Add operator_new to smart_ptr_trait.
Rename smart_ptr_trait::operator_new to construct_null per feedback from Chad.
Add a test to verify we can use static constants defined in classes.
have VirtualFileSystem also depend on the file path so renaming shaders causes a rebuild
Add a sample for adding mixins to embind
Fix a possible double-deletion in embind when returning a smart pointer from an abstract class implementation.
Merge pull request #2099 from waywardmonkeys/upstream-from-imvu

Upstream from imvu