Sync'd branch integration/inbound with upstream @ Fri Oct 10 23:22:38 PDT 2014