Sync'd branch releases/beta with upstream @ Tue Sep 23 07:23:47 PDT 2014