Sync'd branch releases/beta with upstream @ Fri Sep 26 14:27:33 PDT 2014