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