Sync'd branch integration/inbound with upstream @ Wed Oct  8 00:35:40 PDT 2014