Sync'd branch releases/aurora with upstream @ Sat Sep 27 08:45:16 PDT 2014