Sync'd branch integration/inbound with upstream @ Fri Oct 31 13:50:03 PDT 2014