Sync'd branch integration/inbound with upstream @ Fri Oct 31 06:32:41 PDT 2014