Sync'd branch releases/aurora with upstream @ Tue Sep 16 05:27:37 PDT 2014