Sync'd branch releases/beta with upstream @ Mon Sep 29 09:31:30 PDT 2014