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