Sync'd branch integration/inbound with upstream @ Wed Aug 27 21:43:32 PDT 2014