Sync'd branch integration/b2g-inbound with upstream @ Tue Sep 23 01:53:41 PDT 2014