Sync'd branch releases/beta with upstream @ Fri Sep 12 12:35:36 PDT 2014