Sync'd branch releases/beta with upstream @ Sun Oct  5 19:10:27 PDT 2014