Sync'd branch releases/beta with upstream @ Mon Sep  8 11:03:30 PDT 2014