Sync'd branch releases/beta with upstream @ Fri Sep 19 12:46:33 PDT 2014