Sync'd branch integration/inbound with upstream @ Tue Oct 21 04:48:40 PDT 2014