Sync'd branch releases/beta with upstream @ Mon Sep 29 10:43:26 PDT 2014