Sync'd branch releases/beta with upstream @ Tue Oct 14 13:32:40 PDT 2014