Sync'd branch releases/beta with upstream @ Tue Sep 23 22:53:33 PDT 2014