Sync'd branch integration/inbound with upstream @ Fri Oct 24 08:29:44 PDT 2014