Sync'd branch integration/inbound with upstream @ Tue Oct 28 04:26:30 PDT 2014