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