Sync'd branch releases/beta with upstream @ Wed Sep 10 16:13:33 PDT 2014