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