Sync'd branch releases/beta with upstream @ Fri Sep 19 11:37:36 PDT 2014