Sync'd branch releases/beta with upstream @ Mon Sep 29 17:45:37 PDT 2014