Sync'd branch integration/inbound with upstream @ Mon Oct 27 03:53:44 PDT 2014