Sync'd branch releases/beta with upstream @ Fri Sep 19 09:40:17 PDT 2014