Sync'd branch releases/beta with upstream @ Tue Sep  2 21:31:30 PDT 2014