Sync'd branch releases/beta with upstream @ Tue Sep  9 03:03:29 PDT 2014