Sync'd branch integration/b2g-inbound with upstream @ Fri Sep 19 14:18:47 PDT 2014