Sync'd branch integration/inbound with upstream @ Sun Oct 12 17:34:48 PDT 2014