Sync'd branch integration/inbound with upstream @ Tue Oct 28 06:36:05 PDT 2014