Sync'd branch integration/inbound with upstream @ Fri Oct  3 11:02:44 PDT 2014