Sync'd branch integration/inbound with upstream @ Fri Oct 17 10:25:40 PDT 2014