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