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