Sync with master to pick up working rockspecs among others.

Signed-off-by: Gary V. Vaughan <gary@gnu.org>