Sync'd branch integration/inbound with upstream @ Fri Oct 10 21:36:44 PDT 2014