Merge commit '6acca9e'

With:

  $ git merge -s ours --log 6acca9e

because we don't want to roll back the master branch's runtime-spec.

* commit '6acca9e':
  Godeps: Roll runtime-spec back to v1.0.0-rc1