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