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