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