Sync'd branch integration/inbound with upstream @ Wed Oct  8 13:21:57 PDT 2014