Sync'd branch integration/inbound with upstream @ Fri Oct 24 15:12:57 PDT 2014