Sync'd branch releases/beta with upstream @ Wed Sep 10 12:56:34 PDT 2014