Sync'd branch integration/inbound with upstream @ Fri Oct 10 10:03:39 PDT 2014