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