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