Merge master into platform/Luna

This includes the #733 PR, which should reestablish the luna nightly.