prepare to submit this spec to Nova
Merge remote-tracking branch 'origin/master'