Sync'd branch integration/inbound with upstream @ Fri Oct 24 21:52:43 PDT 2014