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