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