Sync'd branch integration/inbound with upstream @ Mon Oct  6 23:23:44 PDT 2014