0.15: promote current nightly to dev
Merge remote-tracking branch 'upstream/master' into upstream-0.15