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