Sync'd branch integration/inbound with upstream @ Mon Oct 27 19:42:37 PDT 2014