If APC is not installed, don't fill up with warnings
Updated repo and solved conflicts