Sync'd branch integration/inbound with upstream @ Tue Oct 21 20:26:42 PDT 2014