Sync'd branch integration/inbound with upstream @ Mon Oct 27 18:09:49 PDT 2014