Sync'd branch integration/inbound with upstream @ Tue Oct 21 21:17:12 PDT 2014