Sync'd branch releases/beta with upstream @ Tue Sep 23 13:18:31 PDT 2014