Sync'd branch integration/inbound with upstream @ Fri Oct 31 15:16:31 PDT 2014