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