Sync'd branch integration/inbound with upstream @ Fri Oct 24 11:27:10 PDT 2014