Sync'd branch integration/inbound with upstream @ Sun Oct 12 11:25:36 PDT 2014