Sync'd branch integration/inbound with upstream @ Fri Oct 24 18:35:47 PDT 2014