Sync'd branch integration/inbound with upstream @ Fri Oct 31 04:17:39 PDT 2014