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