Sync'd branch integration/inbound with upstream @ Wed Oct  8 16:31:37 PDT 2014