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