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