Sync'd branch releases/aurora with upstream @ Tue Sep 16 15:22:34 PDT 2014