Sync'd branch integration/inbound with upstream @ Fri Oct 17 16:36:45 PDT 2014