Sync'd branch releases/beta with upstream @ Wed Oct  1 12:29:35 PDT 2014