Sync'd branch integration/inbound with upstream @ Fri Oct 10 19:47:40 PDT 2014