Bundle update
Merge branch 'master' into os_x

* master:
  Bundle update