Merge bugfixes; assets