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