Sync'd branch releases/beta with upstream @ Wed Sep 24 06:51:38 PDT 2014