Sync'd branch integration/inbound with upstream @ Fri Oct 24 09:33:42 PDT 2014