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