Sync'd branch integration/b2g-inbound with upstream @ Tue Sep 23 03:03:42 PDT 2014