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