Sync'd branch integration/inbound with upstream @ Mon Oct  6 14:31:37 PDT 2014