Sync'd branch releases/beta with upstream @ Mon Sep 15 06:37:22 PDT 2014