Sync'd branch releases/beta with upstream @ Tue Oct 21 12:55:38 PDT 2014