Sync'd branch releases/beta with upstream @ Mon Sep 15 08:47:32 PDT 2014