Sync'd branch integration/inbound with upstream @ Sun Oct 26 15:47:43 PDT 2014