Sync'd branch integration/inbound with upstream @ Tue Oct 28 14:13:42 PDT 2014