Sync'd branch integration/inbound with upstream @ Sun Oct  5 19:18:38 PDT 2014