Sync'd branch integration/b2g-inbound with upstream @ Sun Oct  5 23:13:44 PDT 2014