Sync'd branch integration/inbound with upstream @ Mon Oct 27 15:22:12 PDT 2014