Sync'd branch integration/inbound with upstream @ Mon Oct  6 04:40:52 PDT 2014