Merge branch 'refs/heads/master' into beta
Bump version to v1.2.5 for CoreOS Beta 444.2.0

- Update bash
  Fixes CVE-2014-6271 and CVE-2014-7169