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