Sync'd branch integration/inbound with upstream @ Sun Oct 12 15:58:41 PDT 2014