Sync'd branch integration/inbound with upstream @ Fri Oct 24 13:45:41 PDT 2014