Sync with upstream

Sync with upstream - 2014-06-22