Merge branch 'upstream_libresoc' into libresoc_master