Sync'd branch integration/inbound with upstream @ Mon Oct 27 03:32:10 PDT 2014