Sync'd branch integration/b2g-inbound with upstream @ Fri Oct  3 14:38:37 PDT 2014